Merge "Replace ConnectivityManager hidden symbols on BT"