[automerger skipped] Merge "Merge Android 12L" am: 470cc63243 -s ours am: 1f4c14a0c7 -s ours am: 6bf6d91b6f -s ours

am skip reason: Merged-In Ida76321ddb16fb47ba5204d106e7e6c2f1bb8457 with SHA-1 5ed511b3d7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2013183

Change-Id: I96347c428f9c87b306c5457901aaf3052f3c2498