2020-08-14: merge master to rvc-dev am: 5fcd8997c2

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

Change-Id: I02d654c634dc7b8a55d2d3ffd20716e6ed617a5f