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

[automerger skipped] Merge "Reland: Change input injection security model" into tm-dev am: d0f6ad2f am: 200c269f -s ours am: 4c3d0cd4 -s ours

am skip reason: Merged-In I503e4f087501e3aecf2c18b4b1d27e51ecda59ac with SHA-1 0f9ea02b is already in history

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



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