Merge "SurfaceControl: add getAllowedDisplayConfigs"