Merge "Don't reset the reported proc state while cleaning up the process" into sc-dev am: cbf8dc63ba

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

Change-Id: I3fbbcbad62e2711e2d8a0086607a970988146b3a