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

Change-Id: I120efb0217d0d0e1a0ae378621ae0aabc0fde408