Merge "Move the ImsService tests to CTS, requiring @TestApi"
am: 6e5fd21a65

Change-Id: Ide7066d63c5f770475cde0af5d426d89d4f2371f