Merge "Fix PAN control callback definition to match what bluedroid is doing."