Merge "[automerger skipped] Merge "Add GTS test APIs for testing ImsService" am: 5a6df1afa7 am: 1946960f9a  -s ours am: d4b16b7b33  -s ours"