Merge "[automerger skipped] Merge "Add GTS test APIs for testing ImsService" am: 5a6df1afa7 am: 1946960f9a  -s ours" into pi-dev-plus-aosp
am: 51293743ce  -s ours

Change-Id: I18a049598dc7f80c34661175b4ed70aa04d0758a