[automerger skipped] DO NOT MERGE - Merge Android 13 am: 12f3a71e92 -s ours am: 02a8a09938 -s ours am: b58983bded -s ours

am skip reason: Merged-In Iabfc69ff9de5b7ed996e678344a9a2696f2cc47d with SHA-1 921ea8ee59 is already in history

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

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