Merge "PREUPLOAD.cfg: format dumpstate" am: b2b348f8 am: 97ccf9d8 am:...

Merge "PREUPLOAD.cfg: format dumpstate" am: b2b348f8 am: 97ccf9d8 am: 19c7b38e am: a926f323 am: bee56c88

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



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