Merge "SurfaceFlinger: use isDisplayConfigAllowed in dumpVSync()"