Merge "Clean augmented-only autofill sessions when augmented service changes." into qt-dev
am: a517b0d8d2

Change-Id: I2e969e4f14a352d5f17b24a217f0b607137494b2