[automerger skipped] TP - Message reference for SMS SUBMIT type am: 893f2410...

[automerger skipped] TP - Message reference for SMS SUBMIT type am: 893f2410 am: 2262d65e am: ba55d8d1 -s ours am: 329cfd71 -s ours am: 9ed4be63 -s ours

am skip reason: Merged-In I421db7ca022977ed5d76ce6f7cf0fb36b53482bb with SHA-1 86187e30 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2459499



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