Snap for 7863714 from 2a2a33e677b3030cc61be4db57dcd8eaba807424 to sc-v2-release am: a172cef3e3

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

Change-Id: Ie758e471fd26443f29bb4c6b8c3f7973e3e9e2da