[automerger skipped] Merge "Fix AAudio waiting for stop SIGABRT" into...

[automerger skipped] Merge "Fix AAudio waiting for stop SIGABRT" into sc-v2-dev am: 2545ce7c -s ours am: 7bb017c1 -s ours am: 6abb05f2 -s ours am: b64ab634 -s ours

am skip reason: Merged-In Id865ef3f55f3cf006fd94d7b376d1b87ad999ca5 with SHA-1 318e42a8 is already in history

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

Change-Id: I1313c1c8a4616e40ee0151a34459c97e44e368fb