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

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

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