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

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



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