Merge "Fix crash issue when user uses multi-window mode on VoicemailSettings"
am: 1ed70c32f4

Change-Id: I875dc580093be0bb8317905da608af727edfc394