Ensuring KeyguardService has the correct user when it starts
am: 323d2bbc34

Change-Id: I5bf0b68dc4def450c2e395ad619dd18104523c5e