am 723e1ea5: am 0494f551: am 41befac5: Merge "Remove unused TextMessagePackageChooser" into mnc-dev

* commit '723e1ea5ddfe5d97414d17f3766e051765cda686':
  Remove unused TextMessagePackageChooser