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

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

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

Change-Id: I9cce78c749ac2a4d6e8fd636cd8311f616a07c66