Merge "Fix bug that two messengers app showing on sharing voicemail screen." am: b6b92e66be
am: 5e36a6fc16

Change-Id: I7575edb6fe2a42e7af1571624fbe2a5bc9bc62d4