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

* commit '689c097eb3ad838f18fd13493cc0d73260f1137e':
  Include new AOSP messaging app in base AOSP telephony builds.