[automerger skipped] Merge "Send protected intent ACTION_SMS_MMS_DB_LOST on mmssms.db corruption or lost mysteriously" into pi-dev am: ad6bab2e57
am: db1591f00e  -s ours

Change-Id: I137d2c64aa3cfd7e55dfe61d8f8329b0373a3164