Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d0 am: c275b77b am: 1f853665 am: bc560108 Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026