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

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



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