Merge "graphics.common V3 -> V4" am: 06c4f5fda8

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

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