Merge "Cleanup and improve AVRCP logging"