Merge "Do not inset autofill highlight" into oc-dev
am: ac1c224cdc

Change-Id: I8e37f008c016d25077fe690477422fd4e7422f29