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

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



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