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

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

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