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

Change-Id: I6811e1db5010787f2db60fcd1ce1e34fb4968c41