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

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



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