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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40cdb20ce105cebfc28a4397aa0cb9f83abadcc2