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

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

Change-Id: I7f9d1a461968d68a82f4015fb817eba8e199df95