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

Change-Id: I0642ef746f9deeef58b3e689287b9378e14c038b