Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev am: 1d04eb6e

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



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