[automerger skipped] Merge "PasswordSlotManager: Fix incorrect string comparison." into qt-dev
am: 442b09472d -s ours
am skip reason: change_id I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb with SHA1 d1552e36f4 is in history

Change-Id: I1960e2aa776e8b00a1fd1e50dc017e66049f51ca