Merge "Add VisibleForTesting to create TelephonyRegistryTest."