Merge "Fix A2DP device is not made active when connected" into udc-qpr-dev am: dfd708e5

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



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