Merge "[automerger skipped] Merge Android 13 QPR1 am: 61f1030684 -s ours" into stage-aosp-master am: 7ae45e84db -s ours

am skip reason: Merged-In If952b1a340a98999cbdf90a7b41865926699c1d2 with SHA-1 b952672cb8 is already in history

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

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