Merge "Support insert messages into ICC EF_SMS" am: 6cca75740b am: cc4a266c25

Change-Id: I1bda86c9dedd8c638a665fe4aa55cc6d2f0c5dbc