2020-10-22: merge master to rvc-d1-dev-plus-aosp am: 4f6335710b

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

Change-Id: I3de27f69d83983a853dc0cc272daf9e833626133