Android O MR1 IOT Release Smart Display r30 (OIMI.200528.001)
Merge changes from topic "async_keystore2"

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