Merge changes from topic "am-4f7b91026d4b4c6294ccaf44c0893603" into...

Merge changes from topic "am-4f7b91026d4b4c6294ccaf44c0893603" into rvc-d1-dev-plus-aosp am: 9a5cdaea am: fb900f9c

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

Change-Id: I57ab3850a6db64cb971dcb6382b8cd5006743e83