[automerger skipped] Merge 10952656 am: b6d892dbcb -s ours

am skip reason: Merged-In Id36c3055e6cb0e2083a975455a549e05dbb80165 with SHA-1 fe4d155acd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/25093203

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