Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev