Android Mainline 11.0.0 Release 23 (7208273)
2020-09-25: merge master to rvc-dev am: b5679b45e8

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

Change-Id: Id9f740e43ba1f5b23a5ce4ddfa9c4f1ebee51fb8