Merge "Rename visual voicemail sync intent value am: bd29340361 am: 9adf20f625" into nyc-mr1-dev-plus-aosp