Merge changes from topic "RCS single registration metrics" am: 3f8a9b5b11 am: 9e52f1c117

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

Change-Id: I5e173cebc5b856f9f1d0d3cb14b766243ab03002