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