[automerger skipped] 2020-08-25: merge master to rvc-dev am: 944fa3b3a4 am: f230b323f5 am: 5fcfe22d75 am: 0d23ce0e30 -s ours

am skip reason: Change-Id Ic6720cb20f47710789e39d34018315705182a8d5 with SHA-1 4a8ec00afb is in history

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

Change-Id: I4b302267c790c0aca56eef95f732a2eb2ecd6ebe