[automerger skipped] Merge "Update getVoiceMailNumber to match set logic."...
[automerger skipped] Merge "Update getVoiceMailNumber to match set logic." into stage-aosp-master am: cc5c80b0
am: fe5b1022 -s ours
am skip reason: change_id I3dbcd0bfcdaafa815c3b78d9b87af282bb361091 with SHA1 e278101b is in history
Change-Id: Idd2e16453e33ec7d4ad15f194ae8cb0082553fad