am 633233b: (-s ours) Reconcile with jb-release - do not merge

* commit '633233bc9ec0f3961b096fea933ecaa454214fd7':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.

Author: The Android Open Source Project