[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: a7789619cd -s ours am: 82a23bddaa -s ours am: 522a79e238 -s ours

am skip reason: Merged-In I57adede47416e28451bbafaab7927314ecd006e6 with SHA-1 9212a425a4 is already in history

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

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