[automerger skipped] Merge "Include WMShell protolog in bug-report" into...

[automerger skipped] Merge "Include WMShell protolog in bug-report" into tm-qpr-dev am: 74482fc0 -s ours am: d1c6c060 -s ours

am skip reason: Merged-In I2f48511868a871a290ca38126c4a4c3016169db4 with SHA-1 9ec5c257 is already in history

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



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