Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()"