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

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

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



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