Merge "Map RkpProxyException error codes into get key errors" am: 5cd5d98e...

Merge "Map RkpProxyException error codes into get key errors" am: 5cd5d98e am: edb504eb am: 071a5cc3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2415815



Change-Id: I2ecab136b8295a4c8cac8f3c72c7f4e5e2886ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>