am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call -...
am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev
* commit '4ec2381b':
Suppressing Face Unlock during phone call - fix b/7339069