Merge "Fix AudioSystemTest#StartAndStopAudioSource flakiness" am: 1ab420acc6 am: 4ae81d3991

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

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