Merge "Fix force close of voicemail activity caused by screen rotation" into nyc-mr2-dev am: 1417ba671c
am: a32ad547dc

Change-Id: I7f6e2d4b105646241e3e2f0b68a38ff353b9131b