Merge "SurfaceFlinger: add getAllowedDisplayConfigs"