Merge "Ensure injected touches poke user activity" into udc-qpr-dev am: 8c3fdc35 am: 284bf922

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



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