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: Ic0b39c66ef4ef7a96fa470b2d2756c27a42c1ed3