Merge "ConnectivityService: minor formatting change" am: 4c949ee07c
am: 9374e0b598

Change-Id: Iddfb8c44b1fc539039dd0b32daa64ac538cb285f