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

Change-Id: Ia636defc0757b0480a6a2b0e160bd848fec8cf99