Merge "[automerger skipped] 2020-07-20: merge master to rvc-dev am: 60a03412fc -s ours am: 462e65a9ac -s ours am: f747b16cf2 -s ours" into rvc-qpr-dev-plus-aosp am: ea094cf17b -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: I337dbd5102ffe2d487b4b4fbe5d708b14fe5d296