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

Change-Id: Ia937e64d342a2e1d122d7840b3c5b678efc826c3