am 41befac5: Merge "Remove unused TextMessagePackageChooser" into mnc-dev

* commit '41befac50bd4c9dd280ea5e9ae203995079f4730':
  Remove unused TextMessagePackageChooser