[automerger skipped] Merge "AudioService: fix...

[automerger skipped] Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev am: 72d3082e am: 60b0c9d2 -s ours am: 4bb0bab3 -s ours

am skip reason: Merged-In I29f9d9a5d9e7fb2c0865dfa0c86e7531bb148b41 with SHA-1 183c8a3a is already in history

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



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