[automerger skipped] 2020-06-24: merge master to rvc-dev am: cbaf0a0453 am: 6e0b6c60d0 am: 36586fbc41 -s ours

am skip reason: Change-Id Ic58f9dfef22bb92ecb143563e90a6af430b433d0 with SHA-1 de19ddd153 is in history

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

Change-Id: I4b23e5ca400296ee81ebf50a7aa0e15befc6bf6e