Merge "Replace ConnectivityManager hidden symbols on framework"