Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e am: b353fbcb7a am: 9422f6e991 am: cc2fcef375
am: 6ad6e7f2f4

Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c