am 71fde725: am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev

* commit '71fde725b61abc637aab6be41a50353702775431':
  Include new AOSP messaging app in base builds.