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

Change-Id: Ibbf628df95ae59a24905df9f3e2a8e9d64d78494