Merge "Resolve API dependencies on BluetoothPan"
am: bad5a30d4f

Change-Id: Ic9e920c37c6417485f5be12ac6137bb6e0626b92