Merge "Merge "Fix cleanup when an app with SUSPEND_APPS is deleted" into rvc-dev am: 118790bb am: ee2fa234 am: a6f44976" into rvc-qpr-dev-plus-aosp