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

* commit '3ee47ae7ee0d0afc0a2bbe71636c31483b5502cd':
  Fix 6804479: "Emergency calls only" in notification shade