Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am:...
Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am: 29899487" into qt-qpr1-dev-plus-aosp
am: b4bb490d
Change-Id: I51e322b399077651ea08c1b3acab1d06eb38ec49