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

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

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



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