[automerger skipped] Merge "Update getVoiceMailNumber to match set logic." am: e586ffb2 -s ours
am: b0db5e64 -s ours
am skip reason: change_id I3dbcd0bfcdaafa815c3b78d9b87af282bb361091 with SHA1 a00890ec is in history
Change-Id: I33b252a5fcffd590b5f9bfb7aecbcfc7282a6d03