Android O MR1 IOT Release 1.0.12 (5501548)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXNHLWQAKCRDorT+BmrEO
ePuKAJ0afq+SyY26qRV4TnPVRuAl/54lwQCeLckr6LgOi9H8L11dtqIR0hBGGvE=
=3mwd
-----END PGP SIGNATURE-----
Merge changes from topic "verbose-vendor-logging"

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