Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev...

Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b am: 2cb8ea94

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



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