Changes to align with improvements to ImsiEncryptionInfo.

BUG: 35606429
Test: NA
(cherry picked from commit 4e04c6c89b34c5540287358d5ba6403000e6fe67)

Merged-In: I625a709ea2eedfbc989dffdbbf38b2e008de38fe
Change-Id: I625a709ea2eedfbc989dffdbbf38b2e008de38fe
1 file changed