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