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

Change-Id: I3164564654fd55d7001c735700f3eca12b5bb6e0
tree: 9c5fdbd804adee9644773b16eb7e219c58be604f
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE