Merge "profcollect: check if ADB is active when the service starts." into main...

Merge "profcollect: check if ADB is active when the service starts." into main am: c20ef789 am: 1b784624

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



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