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

Change-Id: Id22859b30b848418cbc1bcf46c74ebd2aa88cd06