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

Change-Id: I25a21fb44cddbbee9bc251d13a476a5d9fdfbe90