[automerger skipped] Merge "Add flag to mark key usage code as a fallback...

[automerger skipped] Merge "Add flag to mark key usage code as a fallback mapping" into main am: 587fb0bf am: 0728d6ed am: d10b9935 -s ours

am skip reason: Merged-In I137113d0dc9a1c8abf523b96942486be176d0240 with SHA-1 b2aff84f is already in history

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



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