Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c4

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



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