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

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



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