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

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