[automerger skipped] Merge "Clean augmented-only autofill sessions when augmented service changes." into qt-dev am: a517b0d8d2
am: d4a8c28994 -s ours
am skip reason: change_id I3de4895e2baea6f127ec3062bc0affbc40343d52 with SHA1 6a02213f12 is in history

Change-Id: Iedadd7215b9df8545a7416f04e943224e446c23c