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

Change-Id: Ib0cd3d66a4eef9d93e8f952dfd528d0cf714e8e5