am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone...
am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
* commit '85a4ac92':
Face Unlock is shown correctly during a phone call - fix b/7271718