Merge "Add flag to mark key usage code as a fallback mapping" into main am: 587fb0bfb5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2896061

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