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: I79f4598fd2d915422d8db6b3ed0076f78a369dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>