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: 318bf150 am: 9da2a90c

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



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