Merge "Fix Audio output sometimes fails to apply when bluetooth re-enabled"...

Merge "Fix Audio output sometimes fails to apply when bluetooth re-enabled" into udc-dev am: 346fd1ae am: c48f0f82 am: 128658a9 am: 613ce0c4

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



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