[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-cherrypick-uievent-move-master-psh3rlonw7-h8mtjk3k65" into tm-dev am: f80d0142 -s ours am: 1953aee2 -s ours

am skip reason: Merged-In I27ebffa6817575f1377beb80f4092287d9b12c49 with SHA-1 cbc4d681 is already in history

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



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