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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b44537cfeb605abdfa0c16737e96fa3e724507d