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

Change-Id: I05e68a72367bb69a9dcdda6125ec31cc02e9c173