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

Change-Id: Ia2a25b560dd0aac670472a78583fa890b24c0633