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