[automerger skipped] Merge "Fix wallpaper window multi-touch" into tm-qpr-dev...

[automerger skipped] Merge "Fix wallpaper window multi-touch" into tm-qpr-dev am: b4ae6ece am: 5d445d91 -s ours

am skip reason: Merged-In Ie53279f18838c459e528b24709aebf739290dc41 with SHA-1 c539dbb9 is already in history

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



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