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

Change-Id: I192d120921e745f676de613fc152319c14ddb02b