[automerger skipped] Merge "Migrate PermissionAnnotationDetector to global...

[automerger skipped] Merge "Migrate PermissionAnnotationDetector to global lint checks" into main am: 243cceeb am: 39fab142 -s ours

am skip reason: Merged-In I2cad77cbc7883087dd95b9558d3543fcb321bbc8 with SHA-1 a7b7ae82 is already in history

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



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