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

Change-Id: I6f126e38027a5cc6a4a07d94a1166369b13e7e00