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

Change-Id: I20062d6da668d83a6b4dee02283c5164aeb18d72