Merge "ConnectivityManager: fix style issue" am: e74f3adba5 am: ec54a40339
am: ec7447b291

Change-Id: Iecf5399d77ae742cc66ac7a3cab4570464c4e95f