am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread

Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'

* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
  Revert "Revert "Move SIP telephony related codes to framework.""