2020-06-24: merge master to rvc-dev am: cbaf0a0453

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

Change-Id: I4499740f373d53a5cfe33a65f95c7a1416743b1d