Android Mainline 11.0.0 Release 35 (7314025)
2020-08-25: merge master to rvc-dev am: 944fa3b3a4

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

Change-Id: If8e94763665047ba3a17bb1b01342b31d3ab4a90