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

Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1