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

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