[automerger skipped] Merge 10952656 am: 4a5ab22eff -s ours am: b11325b40a -s ours

am skip reason: Merged-In Ib9494d167e0d433adb05ce071df978d7dfe566f9 with SHA-1 ef76bfbd1b is already in history

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

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