Merge "Fix cts Pre/post Processing failures on Cuttlefish aidl" into main am: 48415986d9

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

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