Merge "Fix for dEQP-VK.*.extended_dynamic_state.*.enable_raster" into udc-dev am: 9735e6d368 am: babd5cc84a

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25018260

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