Merge "[STOPSHIP] PackageManager: Add package setting flag for N upgrade" into nyc-dev