2020-06-24: merge master to rvc-dev am: cbaf0a0453 am: 6e0b6c60d0 am: e3dcd7f55a

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

Change-Id: If75dc34e7ef994fa6355095ab4bc7215e071c854