2020-07-20: merge master to rvc-dev am: 60a03412fc

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

Change-Id: Ia9d8949d475e39e0b29a7c35dc424e67b83d0292