[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 13490aef66 -s ours am: 4b3901932b -s ours

am skip reason: Merged-In I1e44bb734850ccdcedd8bb1f2b800fc5d9f52261 with SHA-1 b97e59e8b2 is already in history

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

Change-Id: Id631bb6efdcd4bb2d0c4b394bafb3650ba9b590f