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