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

am skip reason: Merged-In I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f with SHA-1 1b463332 is already in history

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



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