Merge "Merge "Fix cleanup when an app with SUSPEND_APPS is deleted" into...

Merge "Merge "Fix cleanup when an app with SUSPEND_APPS is deleted" into rvc-dev am: 118790bb am: a71d0532" into rvc-d1-dev-plus-aosp am: 45c0c655

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

Change-Id: Id13168a8350088600c6593b1df4074dc6352ce91