Merge "Add ADPF GPU impl flag for SurfaceFlinger" into main