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

Change-Id: Id457833fd93065074d8d338d577e91da857ba41b