[automerger skipped] Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." am: c02d53b081
am: bed2a24661  -s ours

Change-Id: I35e2ea4ffc686f288d573ad197324e9ae86d0d03