Merge "Protect autofill UI against redressing - CTS" into oc-dev
am: 42bc75bd71

Change-Id: If1bf63c6edcc6f80af46c9a08379c3b16fdccb78