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

Change-Id: Iee7beb952d58e7c117fa2fc50537988c7ad8b443