Merge "ConnectivityManager: fix potential NPE" am: b688dd18ab am: ab453cd565 am: 7c9cc1f9e5
am: f648c98762

Change-Id: I628fdf36a5a80a2d93ff4c4785253cb16a9e4ad2