am c22b858c: Merge "Fix incorrect PreferenceScreen key for SIP account settings" into lmp-dev

* commit 'c22b858c014433879898d47026293ef5bce38d68':
  Fix incorrect PreferenceScreen key for SIP account settings