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

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

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