[automerger skipped] Merge "Allow override own number as voicemail number for...
[automerger skipped] Merge "Allow override own number as voicemail number for GSM" into pi-dev am: 38dc94ee -s ours
am: 79eb4192 -s ours
Change-Id: I3f6a36e192ab345b765995450e585a652209a165