[automerger skipped] Merge "aaudio: preserve requested device ID, fix...

[automerger skipped] Merge "aaudio: preserve requested device ID, fix regression" into tm-qpr-dev am: c3238c22 am: 98031bcf -s ours

am skip reason: Merged-In I51f0517e719b847f519bb08d3e5b0afb9b4d2f36 with SHA-1 7bc710b9 is already in history

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



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