Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev
am: 5182f884f2

Change-Id: Iba84de809f74507587077857e2067f83ad28b313