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

Change-Id: Ic8d55c898d434f06f78c0522accf3cf453c79eb5