Merge "[AIDL CTS] Fix AudioPreProcessingTest cts failures"