[automerger skipped] Merge "Broadcast ACTION_SMS_MMS_DB_CREATED when mmssms.db is created." am: 07aae9e2a5
am: a2caaf3427  -s ours

Change-Id: I4a9af54141aec0f4421b731ea4338a8a613c38d6