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

Change-Id: Id2e10f670cf6687fe62dbe67bb7615b9121743f4