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

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

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