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

Change-Id: Ie62b9893c5b5f4e7b24197c1308d33e06a6c8f71