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

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

Change-Id: Id001f8177ffc7f0d613fe5ebfff8a953047c6df6