[automerger skipped] Merge "Reland: Change input injection security model" into tm-dev am: d0f6ad2f am: 71931a53 am: 679384fc -s ours

am skip reason: Merged-In I503e4f087501e3aecf2c18b4b1d27e51ecda59ac with SHA-1 379d54a3 is already in history

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



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