Merge "Support save-for-bugreport command in WMShell" into tm-qpr-dev am: bc8078abdd am: a778b301e3

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

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