Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
am: 31bcb22572

Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005