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

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

Change-Id: Iea60a838e9a5274898464aea6e09040d98e20c51