Merge "Map RkpProxyException error codes into get key errors" am: 5cd5d98eb7 am: edb504ebf5

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

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