Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c am: da8c78f0

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



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