Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am: 80aefae026
am: e6e67e2396

Change-Id: I5b0219998a6de6709bec137237583c050a6cdc02