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

Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c