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

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

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