Merge "Merge "Delete package directory when app is uninstalled." into rvc-dev am: 9d298d4d am: 981a7ddf" into rvc-d1-dev-plus-aosp