Merge changes from topic "am-060ba42b837a46d8a51837c7263132f7" into...

Merge changes from topic "am-060ba42b837a46d8a51837c7263132f7" into tm-d1-dev-plus-aosp am: 63da7736 -s ours

am skip reason: Merged-In I7d0f8d2f6af4bc4210060f0a44469db2afc7a1bb with SHA-1 e4e77f45 is already in history

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



Change-Id: I77fc03550172cfda5248e977b5a2746544ccacb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>