Merge "Merge "Revert "Enable protolog by default for WMShell"" into tm-qpr-dev...

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

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



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