Merge "Reinstate USER_PRESENT for ConnectivityService" am: e6aea7d299 am: ebb56ce1fb
am: 4d00a13c35

Change-Id: Id22859b30b848418cbc1bcf46c74ebd2aa88cd06
tree: cb597c62143545d8adfc37345d2a4cb214fdc835
  1. core/
  2. services/
  3. tests/