Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()"

api/current.txt

core/java/android/net/ConnectivityManager.java

core/java/android/net/IConnectivityManager.aidl

core/java/android/net/NetworkWatchlistManager.java

...va/com/android/internal/net/INetworkWatchlistManager.aidl

...ces/core/java/com/android/server/ConnectivityService.java

...android/server/net/watchlist/NetworkWatchlistService.java