Merge "Reinstate USER_PRESENT for ConnectivityService" am: 2c8229456a
am: 433631edfe

Change-Id: I2c5b9061435e17d8319a3109e28fa2a1b6f75154