Merge "profcollect: Disable tracing while ADB is connected" into main am: 6511b8ab6b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3318211

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