Merge "Properly store incoming messages on incoming sessions" am: cea810ff13 am: 9b4af2eda2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc2169a004bb3867888822cc838f884072154ee0