am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev

* commit '4cd9612c3268277581589b34cc49ed04c93873b2':
  Factor out read/write SMS settings seperate from send/receive.