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

Merge "Revert "Change input injection security model to require INJECT_..."" into tm-dev am: 6067a9e8 am: 6a8e6fd4 am: 7200ba9b

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



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