[automerger skipped] Merge "InputManagerService - call PermissionEnforcer...

[automerger skipped] Merge "InputManagerService - call PermissionEnforcer helper on methods annotated with @EnforcePermission" into tm-qpr-dev-plus-aosp am: e4207973 -s ours

am skip reason: Merged-In I39a8583c4732b3d01de47b78955c3b8cff853f82 with SHA-1 9237e8e8 is already in history

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



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