Merge "Enable desktop mode protologs by default" into udc-qpr-dev am: e0da8106

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



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