Merge \\\"Ensuring KeyguardService has the correct user when it starts\\\" into nyc-mr1-dev am: 81bd8d79cb am: 0a51d0c8cf
am: 2f8e6b3098

Change-Id: I6e3e76459ccfbe3e54518072dfe296d27cec5aff