Merge "Add a carrier config indicating whether user can edit a voicemail number" am: 1f8ee4ff25
am: e968d500f5

Change-Id: Ifc4a120e14dd2e2bc6f2bdfe06acfffdf6837bea