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

Change-Id: I79ca629500dbba3a783ef11a9c7a479cebe2509c