am e7f2cafc: Merge "Separate SIM states from Radio states"

* commit 'e7f2cafc172e0671a40e46ce86107c50d884af1f':
  Separate SIM states from Radio states