am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher...
am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev
* commit '327424d6':
Plumbing to allow keyguard to be shown with user switcher (issue 7175023)