Merge "Marks Settings.mPackages as VisibleForTesting"