Merge "Merge "Disable debug logging" into tm-dev am: 36398057 am: 73df4359...

Merge "Merge "Disable debug logging" into tm-dev am: 36398057 am: 73df4359 am: 744a1da6" into tm-qpr-dev-plus-aosp am: 4bfebd7b

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



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