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

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

Change-Id: I58abc5bb406f2920e488b08aa5077a6aab079670