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

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

Change-Id: Ie87c898770eba84edd75c39033937e5dbe4ba146