Merge "Allow SurfaceFlinger_CRITICAL.proto from bugreports" into main