[automerger skipped] Merge "Reland: Change input injection security model"...

[automerger skipped] Merge "Reland: Change input injection security model" into tm-dev am: ceb84d05 am: 8f1c6f0a -s ours

am skip reason: Merged-In I1bf9bd08fa9974ec54bbdddb27892afdda407331 with SHA-1 8a2b1a43 is already in history

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



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