Merge "Allow SurfaceFlinger_CRITICAL.proto from bugreports" into main am: 344b52058d

Original change: https://android-review.googlesource.com/c/platform/development/+/3031846

Change-Id: I32b47fc65f4251b34b4126ce8d1524d19db7c65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>