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

Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7