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

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

Change-Id: I3f7a4ef5719246e9291d19bc1ac7af5521575439