Merge "Fix deadlock from outside Perfetto mutex" into main am: a0eabde1f7

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

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