Merge "Send protected intent ACTION_SMS_MMS_DB_LOST on mmssms.db corruption or lost mysteriously"
am: d34ed7c9f7

Change-Id: If05fc54fa87e017a59eeff0dcebe7b1e7798d445