[automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev am: 0bf3e765f8 -s ours
am:cc53471dcd-s ours am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1716a9412cdis in history Change-Id: I8ae903ed61dd37a37b36e2f878e4f90977e9c1bd
This commit is contained in: