am 64298582: Merge "Check if mmp\'s encoded subject is null before used"
am 64298582: Merge "Check if mmp\'s encoded subject is null before used"

* commit '64298582855d6fd86585c356906651d448d32c22':
  Check if mmp's encoded subject is null before used

bmaupin/android-sms-plus