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

Change-Id: I4b7ad3ad5b612007ee9948f1a2b93ef683c64b3b