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

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



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