[automerger skipped] Merge 10952656 am: 036bc42349 -s ours

am skip reason: Merged-In Idf3691431b1b109fb6de680691fe4d06b7b7bc7e with SHA-1 1f1402d471 is already in history

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

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