Merge "Move enforceCrossUser*Permission() back into PackageManagerService."