Merge "Fix NullPointerException in ConnectivityService" am: 56dbf7cc45
am: d0e6636019

Change-Id: If0c65bd11f5b76e35f6033fa79a8938f7e47a8e7