Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev
am: cc31240f28

Change-Id: I756e4f218f9b593e0329c06fc1663c1833ffa389