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

Change-Id: I6d20769d12b2dab8310e0fc73ad6b06a82d65687