Merge changes from topic "am-22607ad9324041dc882cb2b42df3b2b4" into...

Merge changes from topic "am-22607ad9324041dc882cb2b42df3b2b4" into rvc-d1-dev-plus-aosp am: b0de7eaa am: 0ac1674d

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

Change-Id: I9171fbdf7bb0d93862ddaa8f69077ad504b0864d