Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317
am: 984f1be505

Change-Id: If51ba200f9042bdfc6f9d83c5a4122e9f830f48a