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

Change-Id: I1683f4bd8f3b4db867f1264d387c4a5c34c8a2ea