Merge "Move RCS APIs to android.telephony.ims"
am: 4929a0d782

Change-Id: Ida83ad0354730825ed46dfe2011d2c3ee976c95a