Merge "A2dp: calling setActivedevice in AVRCP when device is NULL" into p-keystone-qcom