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 am: 43c494cb9c am: d08f60ba71
am: a3b1a48d4c

Change-Id: Id55dc21826e027094b3e5bdd445092f9474379bb