Android O MR1 IOT Release 1.0.12 (5501548)
Merge changes from topic "verbose-vendor-logging"

* changes:
  Fix grants get lost on key upgrade
  Clearly indicate vendor errors from keymaster in logcat