Merge changes from topic "am-b75f7374546b417da72660e8f4bd16ae" into...

Merge changes from topic "am-b75f7374546b417da72660e8f4bd16ae" into rvc-dev-plus-aosp am: 1772e0be am: 4c074c50 am: 5c92070a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11685206

Change-Id: Ibee73e7aa25858b82981f2444f17fee3f73fe495