[automerger skipped] Merge "Test for IMSI encryption info APIs." am: be99e9c05a am: bc39f13393
am: 33858e1248 -s ours
am skip reason: change_id I3820d3bd58d1e237314e2a4d8e3a6e95b8637e2e with SHA1 c4b7ad2b79 is in history

Change-Id: I0bf88254a7d6ed6e76d145d89071c51ffad864ca