Merge changes from topic "am-9d4fd6e2855d475da7dcbb537d2bf1ba" into...

Merge changes from topic "am-9d4fd6e2855d475da7dcbb537d2bf1ba" into tm-d1-dev-plus-aosp am: d2ff4985 -s ours

am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 59d49a42 is already in history

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



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