Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862e am: 012c7d29" into oc-dr1-dev-plus-aosp