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