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

Change-Id: I49ad476f4471162270cad67db5342e2023ecb317