Merge changes from topic "am-39b53b3019ba4dd38e8861a245803c35" into rvc-d1-dev-plus-aosp am: 205e11f793 am: 4a1ca30594

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

Change-Id: I2b26c6f83ef055d3433f4599b63172cdc43575d1