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