Merge \\\"Reset voicemail status to disabled for not supported phone accounts\\\" into nyc-mr1-dev am: 44b33c897e am: 7a183711a0
am: 275efdee33

Change-Id: I9708a46fa333a2d28c776892f49a947955b709ce