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

Change-Id: I3d573a1088f18d3ac90e840d61b321b02b73c5be