Merge "Reland: Change input injection security model" into tm-dev am: d0f6ad2f

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



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