Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc0 am: 45bab9dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050



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