Merge "Cleanup ImageInterface.SetImageVariation" into main am: ccc9e3a03f am: 9c2770b840

Original change: https://android-review.googlesource.com/c/platform/external/wayland-protocols/+/3132614

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