MMS API cleanup (4/4)

- Hide APIs not approved by API council (b/17189780)
- Change configOverrides in MMS APIs from ContentValues to Bundle to be
consistent (b/17390017)
- Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council
review (b/17390977)

b/17189780
b/17390017
b/17390977

Change-Id: Id9ae09ae4ef083186b93677ffabf5640c54aa99d
diff --git a/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java b/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java
index 4f900a5..40209fc 100644
--- a/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java
+++ b/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java
@@ -235,7 +235,7 @@
         mSendFile.delete();
         int status = R.string.mms_status_failed;
         if (code == Activity.RESULT_OK) {
-            final byte[] response = intent.getByteArrayExtra(SmsManager.MMS_EXTRA_DATA);
+            final byte[] response = intent.getByteArrayExtra(SmsManager.EXTRA_MMS_DATA);
             if (response != null) {
                 final GenericPdu pdu = new PduParser(response).parse();
                 if (pdu instanceof SendConf) {