[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: dbe2bc2f13 -s ours

am skip reason: Merged-In I2f2ea1b229489b5aed597442c4a90295837f8204 with SHA-1 54483de1c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2377376

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