Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991b am: f4292bac Change-Id: I0c41b74751b2605404ef35cb25e6dbbe33408435