Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
am: 87646514be

Change-Id: I083f1e5c59090340be8afbd4c5178db16ef12772