Merge "Changes to align with improvements to ImsiEncryptionInfo."