[automerger skipped] Merge Android 12L am: 87d0386a89 -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: Ie413becbe19e124451eac46ff0638e2e6cfc2614