[automerger skipped] Try to fix and diagnose Perfetto flush errors. am: 8e7e8a9284 -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: I8d6a3fc6e32a89698976cee9e57a426f6ac44148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>