[automerger skipped] Merge "DO NOT MERGE - Temporary fix to disable augmented...

[automerger skipped] Merge "DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from password fields." into qt-qpr1-dev am: 59fbd30e am: cd66d8cb -s ours
am skip reason: subject contains skip directive

Change-Id: I0e23b1c0c99961c17b9f7b271b90d07e4820b3e4