Merge "Fixed autofill multi-sessions workflow so it only merge sessions flagged with FLAG_DELAY_SAVE." into qt-dev am: 14d85303bb
am: fb7f18756c

Change-Id: I80d7bdfbb4d4fca8153717cfb138a18d0c4ac029