[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 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: Id9c26e53f7563661bf32045d71e4853331388bb7