Merge "Copied recent VoicemailContract changes from framework/base/core to VoicemailProviderDemo."