Merge changes from topic "avrcp_cherry_picks" am: b4e17814f0 am: 898bc38860
am: 8c95e9be38

Change-Id: Ic8c5ef847872b786ad62caf05080bfeb53d5c466