[automerger skipped] 2020-09-25: merge master to rvc-dev am: b5679b45e8 am: ed2f7650f1 -s ours am: d3a9b5cba2 -s ours

am skip reason: Change-Id I80caa0b2f75e8bd559dac47844861bead0773c01 with SHA-1 ed050c71d0 is in history

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

Change-Id: Ia90586ecff7830bb2b05056ef43b8a275072d476