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

Change-Id: Iad75d04a9118936b863987b1535a09f6d9910894