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

Change-Id: I256bfccd5883469a511cd303b211092386bd666c