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

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

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