Snap for 7989966 from ff548389b6d1ca30a36b6561c12e9b7469fb7bc7 to sc-v2-release am: ed7d74384a

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

Change-Id: I0035cda9c9c07e76cc460ea588c3ac51fad83384