Merge "Add dumpsys entry point for package storageStats." into main