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

Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 5a60f5cd am: fe47d509

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

Change-Id: I676f693b02716e6b985ae87a113f9742253dca70