2020-08-25: merge master to rvc-dev am: 944fa3b3a4 am: f230b323f5 am: 5bd22498a0

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

Change-Id: I06c80f5beaf1be8c5140fda3b723f5a39b8d11fb