2020-09-25: merge master to rvc-dev am: b5679b45e8 am: 720cae9753 am: f10cf1dd26

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

Change-Id: I50e5a9db9b43c60d79492dae3eb22c5c6449c8a3