Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adb am: ec54a403 am: ec7447b2" into oc-dr1-dev-plus-aosp