Merge "Expand Voicemails on tapping" am: 50a0f00319
am: 03f9e82d69

Change-Id: I34472ac4fb8022e0626ebbaaa777fcdc56403fdd