Merge "Allow enabling Adb logging dynamically" into main am: d1b89c0c am: f17f41d8

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



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