Merge "Revert "Enable protolog by default for WMShell"" into tm-qpr-dev am: 178a0bf1

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



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