[automerger skipped] Merge "graphics.common V3 -> V4" am: 2e37f01273 am: a33bce869f -s ours

am skip reason: Merged-In I1cb84ec85f98789d0737207a1661b39a25538c96 with SHA-1 132900f4e1 is already in history

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

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