Snap for 8456972 from ed527523fa6d7f3eaa31ccfc6867ee2a752aa41b to tm-release am: c2035a372b

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

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