[automerger skipped] Merge "Move RCS APIs to android.telephony.ims" am: 4929a0d782 am: 7c7dc29e8d
am: 02278c9c53  -s ours

Change-Id: Ia13cf9c8ab55340c1013338f8054bc55c223e005