[automerger skipped] Merge "Add messageId to both of the MMS methods" into sc-dev am: 1f212657 -s ours

am skip reason: Change-Id Ic8e59b652967ab1296a92a1d5727dc226cb190fb with SHA-1 7d998810 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59e470968d29c222e8e0aa702c329e2d31ce7e43