Merge "Select correct device for ENFORCE_AUDIBLE" am: 41c7badd57 am: 13f9652936

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

Change-Id: I5276a0418700c0583d02f5c8f8866f3ead454f28