Merge "Add support for new OUT_OF_KEYS_* errors" am: eac01345 am: f852fd96 am: e746b375

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



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