[automerger skipped] Merge "Try to fix and diagnose Perfetto flush errors." into udc-dev am: ab0ad8d35b -s ours

am skip reason: Merged-In I92c8d2d8d47d1ed123585e1cfdde802d286f120f with SHA-1 80d705566b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23521251

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