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

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



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