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

Change-Id: Ifffb0e04d9851e3714d6dfa50fb088802b484f64