Merge "Fix NullPointerException in ConnectivityService"
am: 56dbf7cc45

Change-Id: I2e6cf2d4a665ec8c106f8dc97891454fe2836a1d