Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adba5 am: ec54a40339 am: ec7447b291" into oc-dr1-dev-plus-aosp