Merge "Fix CTS case failed in CtsAutoFillServiceTestCases" into qt-dev am: 378702d8a4
am: 39d6ff6149

Change-Id: I9b3d326f18619a659ad88c35221319783c3346cd