Merge changes from topic "fcm_exclude_aidl_version" into main am: 76d87305...

Merge changes from topic "fcm_exclude_aidl_version" into main am: 76d87305 am: 74e0c01e am: fa24ef60 am: d9a5e410 am: 29e9b287

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



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