Merge "Remove non-policy check from autofill CTS"