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

Change-Id: If5143090b7959117d79a300b14f8338fb47b6156