Merge "Enable protolog by default for WMShell" into tm-qpr-dev am: 25e295e1...

Merge "Enable protolog by default for WMShell" into tm-qpr-dev am: 25e295e1 am: 5d332d77 am: 069298ba am: 1c82c0dc

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



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