Merge "Read the autofill highlight from rootView context" into oc-dev
am: f51b5f991c

Change-Id: Ibaef62c34d3c966d104244ba3380864451c8cb6c