[automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev
am:0483f072fa-s ours am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1c999faee0eis in history Change-Id: I6eddfc7bae967c76c63521b7fbcabd78a913bfd4
This commit is contained in: