[automerger skipped] Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev am: 0d0bf428b9
am: 3dcb06d687 -s ours
am skip reason: change_id Icecd7cb76688cd19f7e3b445a8228b21e1599068 with SHA1 6a0634dcfe is in history

Change-Id: I8486ce9d5c4e199c6325c5251baa02822e2fa0d2