am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev

* commit '3f1375e50fa29c500f1ce746ec7421bf6afcd8ff':
  Enabling Face Unlock for user switching (bug 8495282)