Merge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev
am: f4849e9848

Change-Id: I049ae546fc0e6cf9d0079ca96b9d67ea7f93745d