Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev