[automerger skipped] Merge UQ1A.231205.015 am: 00796f2e45 -s ours

am skip reason: Merged-In Id0d634a3055e3acf39162f89917da828a5c27122 with SHA-1 0ae0875b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro-kernel/+/25591064

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