Merge "[automerger skipped] Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 am: 910d4e982a am: 1fa4a358f3 -s ours am skip reason: change_id I7bd15f225ac7774ac6e31c766ee0f11302aae3d8 with SHA1 178267d26b is in history"