Merge "Fixed AutofillOptions.isAugmentedAutofillEnabled to use the right client." into qt-dev
am: 17203cd88b

Change-Id: I1698b5b35f7998ad136eb4ea5629a4d1c22d70af