2020-08-14: merge master to rvc-dev am: 5fcd8997c2 am: 58f48dceec

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

Change-Id: Ia03473edf2b251003c6a150611e0b81b4f326463