Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
am: ad84c9552d  -s ours

Change-Id: Icb23ebb9baaf02ac0f9469e9d4601c67d22ba5ad