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

Change-Id: Ifa162b24cf19f85f15f10e0ce975bf3006979a71