Merge "Do not call finishKeyguardDrawn with PWM's mlock" am: 1c3681fe7c
am: 34e4c974aa

Change-Id: I9dcc29873ecb7866343fb733ca700f2a5a757853