Merge "Add missing Avrcp.doQuit() call during A2dpService stop()"