Merge "Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f am: 7220c75f65" into nyc-mr1-dev-plus-aosp
am: 4574c449e9

* commit '4574c449e91e289c7840de23148802c7263a9839':

Change-Id: I5384358263725cb787629a5b0a8f5e0ccfd7428f