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

Change-Id: I946cb4da20d299c529a90ee7557e7d128e2e9504