Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 9fc5843fa8" into nyc-mr1-dev-plus-aosp