Merge changes from topic "am-93433cfaa1dd459d86d59ba5a0437447" into...

Merge changes from topic "am-93433cfaa1dd459d86d59ba5a0437447" into rvc-d1-dev-plus-aosp am: 6a76694e am: 09946445

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

Change-Id: I68b2fd8d24736ad1c9180e7048de51716d37b28a