[automerger skipped] Merge UQ1A.231205.015 am: c5db6f6c -s ours am: d2ede7eb -s ours

am skip reason: Merged-In I856c812d22363cc1d1e8aa88706d4d3b89044f52 with SHA-1 6c625e5d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/25590247



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