[automerger skipped] Merge "Graphics: Migrate graphics.common HAL to version 6" into main am: 584871b697 am: a4b3621200 -s ours

am skip reason: Merged-In I542c1c638b9d63c2510b11d04d6ed98477780af7 with SHA-1 12a9575c10 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/30768495

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