Merge changes from topic "am-cb21d9627e334118b18655797a8d36c3" into rvc-d1-dev-plus-aosp am: 029f8edd

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

Change-Id: I8f93131a3d268eb8df587d004d91e44c0febfc03