Merge "Reinstate USER_PRESENT for ConnectivityService"
am: e6aea7d299

Change-Id: If8b7239cdabdd79d9ea24baf99e95c6ec1a9acf3
tree: 17057c8243b6026a6a663d4622ef5a8677dd12d7
  1. core/
  2. services/
  3. tests/