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

Merge "Disable debug logging" into tm-dev am: 36398057 am: 73df4359 am: 7b87da43 am: e83c438c

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



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