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

Merge changes from topic "am-eedfd1b48b8148d8b87aa8f7e122daed" into rvc-d1-dev-plus-aosp am: e1997bc7

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

Change-Id: I545137f5b6464fbd3b70b58083f1a5ba2f1ebcdc