Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp
am: 52c76834b4

Change-Id: I8f7f117b98298c9df9b6b5ebc64bef6a61d597d6