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

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

Change-Id: Ic7c0bc05122a9439214ce7c4b1063698d0ae1294