Merge "Bug fixed for CTS failures on CtsAutoFillServiceTestCases"