[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1ed70e97e4 -s ours am: a43150e918 -s ours

am skip reason: Merged-In I758de1b4160ddf77866e2adfd593a68b02d34b40 with SHA-1 c01f2cfb9e is already in history

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

Change-Id: Iefc29ea8f8dd2de07bb25b40710a7e6893bded88