Merge "[pm] get data dir without AndroidPackage" into main