Changes to align with improvements to ImsiEncryptionInfo. am: fab79a07e8  -s ours
am: b6b58ad06d  -s ours

Change-Id: I1106566e66599d0c2b5712c86fbf367daf49ea75