Merge "[RCS]Use phone number as the key to manage session" am: 3131106eaf

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

Change-Id: I6428e93c0968d7fbd2525b385b94d4788b41833c