Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e am: b353fbcb7a
am: 9422f6e991

Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d