Merge changes from topics "facesettingchange",...

Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev am: 66a3b3a9

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

Change-Id: I282d2fa05f84914d484e12a58d0728c1ad52866e