Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED." am: 53b4ffad7e
am: b0ea8ee642

Change-Id: Id922446864cb806ddca7f851669bf97754d271ab
tree: e8d05ecdf212f903d4603c1e302f0fed07b522ea
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE