[automerger skipped] 2020-07-20: merge master to rvc-dev am: 60a03412fc am: 65fdbe1756 -s ours

am skip reason: Change-Id Ib27399b76c272c404a0a153597bfe8fd101142fa with SHA-1 9c7d462c31 is in history

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

Change-Id: I20b90886ef3fcb6f391cdc400cf7464afc4387c6