Merge "Save ProtoLog viewer configuration in WMShell" into tm-qpr-dev am: a1db600e am: 4222f4e3

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



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