[automerger skipped] Add a new protected intent ACTION_MMSSMS_DATABASE_LOST am: a30b309f1c
am: 95c8936114  -s ours

Change-Id: I1605ac5721209ede9887012ec3125b998dfd7ec6