Merge "Move findBluetoothRouteWithRouteId closer to the usage and make private"