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

Merge "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" into rvc-qpr-dev-plus-aosp am: 7f97ea46

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

Change-Id: I04618f7083bd13923c861a952707ace52decb132