[automerger skipped] Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev am: 72d3082e am: b4b1c02d am: 14cf099d -s ours am: de15e0bb -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: I0ea301297ec0eee8fa04beb3a7bdaa13b5149a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>