Merge "Device displays fingerprint enrollment after swiping back" into...

Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2d am: 6c1eae8a

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



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