Merge changes from topic "am-51bea38065a94d76abed616f0e984613" into...

Merge changes from topic "am-51bea38065a94d76abed616f0e984613" into rvc-d1-dev-plus-aosp am: ae9e6f1a

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

Change-Id: Ib265391b3b66ad762d3978487415ffdafdf99f87