Do not overwrite carrier/user edits with UNEDITED
am: 58cbcd9400  -s ours

Change-Id: I629f83ddd75faadf47175502d1c92c5f34f8bd15