Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03
am: 1f8536653b

Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d