Merge changes from topic "c2-aidl-pool" into main am: a037962389 am: 106f580ec3

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

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