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

* commit '45973d6d19eb9329d77e62004e80f63f111a27e5':
  Moved setting the flag to suppress face unlock during a phone call