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

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