Merge "Fix cleanup when an app with SUSPEND_APPS is deleted" into rvc-dev am: 118790bb0e am: a71d053223

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

Change-Id: Icceb03ef3b5dd464212af6d624c026aab04afbef