[automerger skipped] Merge Android U (ab/10368041) am: 812edbfc7f -s ours am: 7afac88ddd -s ours am: 0fcd4596b1 -s ours am: 125720c22e -s ours

am skip reason: Merged-In I8e9ca263e387c96a9cb21474ef36d5ea0673dff5 with SHA-1 fdbde8e8a5 is already in history

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

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