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

Change-Id: Ic17f8b385d739817023abcf60657907d8cb3c10f