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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I750ac7d1d555ad4a8c8cbd0c419b0b21d51add69