Merge "Revert "Change input injection security model to require INJECT_...""...

Merge "Revert "Change input injection security model to require INJECT_..."" into tm-dev am: 9fdc02c7

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



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