[automerger skipped] Reland: Change input injection security model am: a9b88d271f am: 2df35ae0d2 -s ours

am skip reason: Merged-In I1bf9bd08fa9974ec54bbdddb27892afdda407331 with SHA-1 5735a328e0 is already in history

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

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