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

Change-Id: I25e52d93b4c94b39082d0e05497f41e74fb3d467