Merge "Improve RCS single registration logging" am: 6423b430a7 am: e547dfc99c am: 988d10e45f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1551618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I954fd0989345f1c3feb7c82160aecdb787d47a8a