Merge "Move RCS specific canonical address handling"
am: f93a422a30

Change-Id: Icb60640b3eec9318a2045c2e954ef20cd027f7a1