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

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

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