Merge "Clean up desktop mode logging" into tm-qpr-dev am: fac53656 am: 81f2e64c

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



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