Merge "Resolve API dependencies on BluetoothPan" am: bad5a30d4f am: e89625113d
am: 8c6b4a1938

Change-Id: I1fbeb090cff73c1902ee676bfb2e0848d1ac5988