Merge "Let dumpstate call "cmd window trace save-for-bugreport"" am: 92be52328a am: 53aa93fed5 am: 5f4d949287

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I520726e11ffff6df717620a5919d6d2cccdfd28a