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

Change-Id: Ic04dd2e141ba40ded41a85f4d8559d3b2adf97e3