fcm_exclude: split HIDL and AIDL predicate.

AIDL is going to have a new format in fcm_exclude:
android.hardware.foo@1. This cannot be excluded
properly when mixing with HIDL, so split.

Test: TH
Bug: 255383566
Change-Id: Idbf57711df992dbc7c7cf7d8c17009a777a402af
4 files changed