Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am: 298994875d" into qt-qpr1-dev-plus-aosp
am: b4bb490d4f

Change-Id: I51e322b399077651ea08c1b3acab1d06eb38ec49