[automerger skipped] Merge "Move the ImsService tests to CTS, requiring @TestApi" am: 6e5fd21a65 am: 5fd6bb9610
am: 2964b930c6 -s ours
am skip reason: change_id Idbdec7790b036aef968d91533cbdb8f096d7717b with SHA1 9b623b66c4 is in history

Change-Id: I509f3a1e3ad69daf041543042be01587e1bb3144