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

Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952