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

Change-Id: Ib034045cbb958733e16cca622b075d26531b9a96