Merge "Bump android.hardware.graphics.common V4->V5" into main