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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I178ca19d89d4ef7f0c389f00a62d139987abb00a