Merge "Fix incoming chat session" am: c11ffaacef am: 0113f44cd5 am: 4f3ad4e1b0 am: b31daa6637

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I921759d297058675122f79e577402480fdeaf077