Fix the flicker of buttons in FaceSettings. am: 9b4e9239 am: 6fa8b76e am: 3d57b69b

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



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