Merge "Add a way to configure log levels" into main am: 4b8c765854 am: fd5b56a241

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

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