am 7d1ef0ce: am 3ee47ae7: Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev

* commit '7d1ef0cee7c61dea18216a80a00d437109b698d5':
  Fix 6804479: "Emergency calls only" in notification shade