Merge "Fix force close of voicemail activity caused by screen rotation" am: 4c8faa4a0a
am: db92a30883

Change-Id: I99c1d07c33ae6a4410ca4be02cb86f9078cd3180