Merge changes from topic "am-ab51d82da2774cb6ad7daad8fa5ac84e" into rvc-d1-dev-plus-aosp am: 3f436546 am: 27305cab

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

Change-Id: Ifae079bf3f72885f999ab329939e3bf7b8dabdc3