Merge "Default EDITED column to CARRIER_EDITED instead of USER_EDITED"
am: ae17a07ec5

Change-Id: I9dd999dc80e2499e2ed8c49e84741a81fed3f0a0