Merge "Update exemptAidlInterfaces and PermissionAnnotationDetector's message" into main am: b5bd3c2c43 am: 35fcad85b8

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

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