Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev