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

Change-Id: I7368ec6679fb170529274a4b63e8ae6ca9d3706f