Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev