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

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