[automerger skipped] Merge "Rename ProcResult stdout and stderr fields" am: cb8f9e3429 -s ours

am skip reason: Merged-In I04770d2d6e82ca8393308ab12a304838a80f0ae5 with SHA-1 faa5e27652 is already in history

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

Change-Id: Ibb38819f3df294342089facea1c09ae61cda8899