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

Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b