[automerger skipped] Merge "graphics.common V3 -> V4" am: 06c4f5fda8 am: 75e17d6783 -s ours

am skip reason: Merged-In I1418307159dbaa9d2acc44997f13a41d629d56c0 with SHA-1 126c03837f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2292293

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