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

Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679