Merge "[pm] Reland: make dataDir null if the app is uninstalled with data deleted" into main