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

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



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