am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev

* commit '17b069107654c04f0ec2cc44d54da3a44006c710':
  Include new AOSP messaging app in base AOSP telephony builds.