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

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

Change-Id: Iaa55f0ecf78f996fb8061a53a91fec826de4da5f