[automerger skipped] Merge "TP - Message reference for SMS SUBMIT type" am:...

[automerger skipped] Merge "TP - Message reference for SMS SUBMIT type" am: 3aee49a5 am: 5a85d8a7 am: 71a037c2 -s ours

am skip reason: Merged-In I3a64b79478d16d730c921fbfdd050fc014eec7b5 with SHA-1 e88f8481 is already in history

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



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