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