Merge "Use timeout consts in all ConnService tests" am: 3fbbe73437
am: 589432e728

Change-Id: I3d4a35aa3b78b455fe527c686b1a5cb2573ba47a