Merge "fcm_exclude: split HIDL and AIDL predicate." into main am: 23847d4411 am: a2f7b02a8c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688566

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