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

Change-Id: I8a12c148eeb7b4d97ad69f5653bf840a896e1106