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

Change-Id: I5d8db1afe6a097d83a9c341ca0ac646a31d7f2bc