Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
am: 80aefae026

Change-Id: Ie18492114c58d1c83c060712d2a936687353ea99