Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev
am: 0d0bf428b9

Change-Id: Iac00caccc37e43c79c36532948bc4d0042f222c9