[automerger skipped] Merge "Revert "Add a new protected intent ACTION_MMSSMS_DATABASE_LOST"" into pi-dev am: 379dbdf91f
am: e2d2fd1320  -s ours

Change-Id: Id24ae6f152228a9dcbbfea60fc6cf13463e67652