Merge "Try augmented autofill if regular autofill is disabled." into qt-dev
am: e33ff60894

Change-Id: Ia7ac96c7b0e0b60f6286e7df798c9af33dd676d3