am d9650191: am 45973d6d: Merge "Moved setting the flag to suppress face...
am d9650191: am 45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev
* commit 'd9650191':
Moved setting the flag to suppress face unlock during a phone call