Merge "Fix incoming chat session" am: c11ffaacef

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1613127

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I031fe20b440ddef946ec030f74876e4d4b3c4366