Merge "Tighthen access qualifiers in BluetoothRouteProvider"