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

Change-Id: Id85d25a445165c38b1f08e5f13744774e4c36fc7