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

Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305