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

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

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