am a1f49d8b: am 295eddb9: Merge "Don\'t show emergency calls label unless...
am a1f49d8b: am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev
* commit 'a1f49d8b':
Don't show emergency calls label unless it's a phone.