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

Change-Id: I1544f15b05c0d0c6ee4de8e6da58af3809dbe36c