Merge "Update fingerprint generic error string description" into tm-qpr-dev...

Merge "Update fingerprint generic error string description" into tm-qpr-dev am: 6f1c42b4 am: d33472ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19784397



Change-Id: Ibadc71798beeb396e386ada2a3d3ec868cbf338a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>