[automerger skipped] Merge Android U (ab/10368041) am: 7322c79a77 -s ours am: 2cc70ed53a -s ours

am skip reason: Merged-In Ic513ddd99ef32dfc018c2ac9de0671781d6183cd with SHA-1 90f6cf2ef4 is already in history

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

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