Merge "Include new AOSP messaging app in base builds." into mnc-dev