am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService. am: 28e752f026

Original change: undetermined

Change-Id: Ifed4a924b7a582bc4b34e177f99a80b5ffd14719