Merge "graphics.common V3 -> V4" am: 470cae3e28

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

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