Revert "Fix VIP conversations alerting incorrectly."

This reverts commit 64c85ac6f5f20d031a7e192366b8335fab0253c2.

Reason for revert: DF blocking Bug: 187009701

Change-Id: I04dfdf20ad5c7df3c6dddf0cc12540b179162f0b
(cherry picked from commit 25c273584ad92f566c41c635a886be9375f50d39)
3 files changed