Merge "Disable falsing manager when face-authed." into qt-r1-dev
am: 9249d828a1

Change-Id: Icfba07cedf942e13c2a5747890b253e6f6d588c0