Revert "DO NOT MERGE Remove unintended face config am: 875235afbf" am: e973ddc480

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18819342

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