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

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

Change-Id: I167ed409e60e9481617096ab4646c58100e5fed3