Fix the flicker of buttons in FaceSettings. am: 9b4e9239 am: 374e2221 am: 07300c01

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



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