[automerger skipped] Merge "Allow face HAL to be updated via apex in U" into...

[automerger skipped] Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae am: 7e69098f am: 80cba87a am: 6fd87a9b am: e10d5e59 am: 6de1143d -s ours

am skip reason: Merged-In Ia3b15f669219a0941498b90a76b42d5f2f5ac80b with SHA-1 dcd2ae7c is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859



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