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

Merge changes from topic "am-ec4551ad20ab4f60af8c4d1f148b29e1" into tm-d1-dev-plus-aosp am: 64481947 -s ours

am skip reason: Merged-In I4bfaf79abaad3cec6f6629fb8bc885a4916a820b with SHA-1 0be926ff is already in history

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



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