[automerge] Revert "Change input injection security model to require...

[automerge] Revert "Change input injection security model to require INJECT_..." 2p: 6b3c6cae am: ba0a46d6

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



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