2020-08-25: merge master to rvc-dev am: 944fa3b3a4

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

Change-Id: I757ec1e64daace7c0f1f618a78f41123fbd29bfa