Merge "Moved EXTRA_CLEAR_NEW_VOICEMAILS to MainComponent."
am: 2c82dcdd42

Change-Id: Ia20425602288d62c9a35ff401615909e0840a494