Merge "Test for IMSI encryption info APIs."
am: be99e9c05a

Change-Id: I7dcd244dcc06953362517424f6efe4d7efba82ff