[automerger skipped] Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev am: 72d3082e am: 754e8227 -s ours

am skip reason: Merged-In I29f9d9a5d9e7fb2c0865dfa0c86e7531bb148b41 with SHA-1 8777944d is already in history

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



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