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

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

Change-Id: I3d7ee6d160649ce479897e8ed2b658041d8c30a0