Merge "Increase the timeout for Hearing Aids Pairing" into qt-dev
am: e0c0b07105

Change-Id: I46927903f6a3ded45e4b4e485fbd98c357705059