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

Change-Id: I028a68c75452a9d2371d5199ebeedb545325c948