Merge "Don't listen for face when in `lockout` or `lockdown`" into qt-r1-dev
am: 16f1032abd

Change-Id: I5b239aa4b67a86dc18a61cdc357ec382baf08bda