Merge "Add line break between PLMN and SPN in windowshade." into gingerbread