am 4751a7b0: am 9a4a0376: Merge "Stop FaceUnlock when detached from window...
am 4751a7b0: am 9a4a0376: Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev
* commit '4751a7b0':
Stop FaceUnlock when detached from window fixes b/7222226