[automerger skipped] Merge "audiosystem_tests: Fix false test failures" into...

[automerger skipped] Merge "audiosystem_tests: Fix false test failures" into main am: 0561ea42 am: 1442d08f -s ours

am skip reason: Merged-In I8b7b59941b5029b8711d961ad792ddd64886b4fe with SHA-1 45930ad4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2977654



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