Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev