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

Change-Id: I4eeabc4775e7a84d999aee5a46754e25546293b5