[automerger skipped] Merge "Rename ProcResult stdout and stderr fields" am:...

[automerger skipped] Merge "Rename ProcResult stdout and stderr fields" am: cb8f9e34 -s ours am: 79e1c12d -s ours am: b19ac11b -s ours am: f748baeb -s ours am: f15c8dad -s ours

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

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

Change-Id: Iccba34d920e98b556d575c9069358ffc7eb3e3e5