Android O MR1 IOT Release Smart Display r4 (OIM3.180907.038)
Merge changes from topic "async_keystore2"

* changes:
  Start keymaster workers on demand
  Multi-threaded keystore