am a96efa27: am 16fc087d: Merge "Fixing crash in BluetoothPbapService."

* commit 'a96efa270cf215602b0ab1f3603c24aadff808da':
  Fixing crash in BluetoothPbapService.