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

Merge changes from topic "am-e267200dd53f48d0a5b1442334855c47" into rvc-d1-dev-plus-aosp am: b954794d am: 47904e54

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

Change-Id: I4033cad22c707bc981a613f609495a7806385248