[automerger skipped] Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev am: cc31240f28
am: d27f2a4d03  -s ours

Change-Id: I3e8015010828aa0ee394c1e3186ed12b86e36000