Merge "Use timeout consts in all ConnService tests" am: bbba1f7f9f
am: 68225bc676

Change-Id: I3d4a35aa3b78b455fe527c686b1a5cb2573ba47a
tree: 2eec36a53c71bba730a4d12c425688591af73075
  1. core/
  2. services/
  3. tests/