[automerger skipped] Merge "Add a new intent ACTION_MMSSMS_DATABASE_LOST" into pi-dev am: e25c238953
am: fce7b175d7  -s ours

Change-Id: I6efafd1a9422f3cf24e1c566c236c70a2d1d8b37