Merge "AVRCP Controller manage active device" am: 9eb36944ea am: 9efa17f67c am: a57462b048

Change-Id: I998e1009b65448e527fdbcf27521e9b16d138eb4