Merge "Fix incoming chat session" am: c11ffaacef am: 0113f44cd5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67708e871d86d91c53c29d30d0c455e1a0ad8296