[automerger skipped] [automerge] Fix AAudio waiting for stop SIGABRT 2p:...

[automerger skipped] [automerge] Fix AAudio waiting for stop SIGABRT 2p: 318e42a8 am: 724cd5ac -s ours am: cb34a1e6 -s ours

am skip reason: Merged-In Id865ef3f55f3cf006fd94d7b376d1b87ad999ca5 with SHA-1 676764f2 is already in history

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

Change-Id: I577163e5e0a97c13e847c46f344d02ec8912712f