Merge "[MMS] Don't show error for non sms app" into udc-dev am: 5c84e498 am: b5a754ac

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22119409



Change-Id: Icfca3590b890311e635f8f08927a580ab4c6dc39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>