[automerger skipped] Merge "Run ImsSmsListener callbacks as self." am:...

[automerger skipped] Merge "Run ImsSmsListener callbacks as self." am: a8ec531a am: e8be6d52 -s ours am: bfb8e336 -s ours

am skip reason: Change-Id Ic0bb62c3b960fda8708e7bebefb1154a2380fd4f with SHA-1 f375a9d8 is in history

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

Change-Id: I0dd7324a4d9a018e8fee0b6fe38dd74ad02ed543