[automerger skipped] Merge "graphics.common V3 -> V4" am: 470cae3e28 am: a89952b69b -s ours

am skip reason: Merged-In I59a458554223fdbf01b2f0288b249ae8299af6fd with SHA-1 199430cf64 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2292234

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