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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie78a5c943df4b6a6058265d9b96e4b81e4c1bab7