[automerger skipped] Merge "Fix GetPhysicalDeviceSurfaceFormats2KHR for compression control struct handling" into main am: 351a8df am: 77c7594 -s ours

am skip reason: Merged-In Id0712387e3249ac6118990441a4bb19102cd4a84 with SHA-1 1bde002 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3242198

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

Author: tomnomgoogleuk