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

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

Change-Id: I4ea285671dd0c8dbd730f899797f5573f557b004