Merge "Reset unset app-ops when the admin sets cross-profile packages."