Merge "Remove developer menu: AVDTP delay reports/inband ringing"