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

Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026