[automerger skipped] Merge "Add new MMS result codes" am: fe5f2423 am: 037b772f -s ours

am skip reason: Merged-In I190345240482437289d26101857d805cf06e0341 with SHA-1 88533afb is already in history

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



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