[automerger skipped] Merge "Send protected intent ACTION_SMS_MMS_DB_LOST on mmssms.db corruption or lost mysteriously" am: d34ed7c9f7
am: a16e1f250c  -s ours

Change-Id: I457293c161b314ca4b605812ed1c7fa2167cc4f1