Merge "Add support for new OUT_OF_KEYS_* errors" am: eac01345e5 am: f852fd961a

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

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