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

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

Change-Id: I9900d8b554b9f650f9fe0e829b144deba97b7b88