Merge "Import VisibleForTesting.Visibility.PACKAGE" into 24D1-dev