Merge "Revert "Add a new protected intent ACTION_MMSSMS_DATABASE_LOST"" into pi-dev
am: 379dbdf91f

Change-Id: I04849190ee2ffefc30021dbe1538485473750794