[automerger skipped] Merge "Increase the timeout for Hearing Aids Pairing" into qt-dev am: e0c0b07105
am: 2627373f7d -s ours
am skip reason: change_id I2e0821e30a0f08a4a123b8b5447a8b44c8830f9a with SHA1 5489a5fbc1 is in history

Change-Id: Ib3aed85e5f1b9c17fa1d17c136adf028f18d707f