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

Change-Id: Ib2e90c7f3c78fb5bf34a652f9c7414e92fd280b0