Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev