Merge "Overlay a highlight over autofilled views" into oc-dev am: 4ebafa8000
am: 7e3af23cc3

Change-Id: I41e65cf34549589c17cea9cc71632925e0402019