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

Change-Id: I259b6fc2256c48d5559026b13d2807143b05ca7b