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

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