Merge changes from topic "am-2b42cf391b69445eacc516b719d5acc4" into...

Merge changes from topic "am-2b42cf391b69445eacc516b719d5acc4" into rvc-d1-dev-plus-aosp am: 7a0ef524 am: 39f2ccb3

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

Change-Id: I652e54d0e5a2c3ac1d31c5945fbf4fd57528a50a