[automerger skipped] DO NOT MERGE - Merge Android 13 am: a4d9d03f47 -s ours am: db4cd01763 -s ours

am skip reason: Merged-In I546ac3bad491e4950d192f8b3f4a20bc3ff5534f with SHA-1 0000c58327 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2184309

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