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

Merge "Fix cts Pre/post Processing failures on Cuttlefish aidl" into main am: 48415986 am: 108782bc am: 035ab7b7

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



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