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

Change-Id: I0dcfee81c0cd5a22ca5cafd171471361e9d84b33