am 311c8922: (-s ours) am 40208a8b: DO NOT MERGE    Fix PAN control callback definition to match what bluedroid is doing.

* commit '311c8922d7b9268b649eea4d6f578f3c65cab468':
  DO NOT MERGE    Fix PAN control callback definition to match what bluedroid is doing.