Merge "Send protected intent ACTION_SMS_MMS_DB_LOST on mmssms.db corruption or lost mysteriously" into pi-dev
am: ad6bab2e57

Change-Id: I7e7699055b101627cf529eaa5e59d0f183ab8e49