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

Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217