Merge "Add CTS tests for InCallService which can see self-managed calls." am: 62e5d82289 am: 5eb9287bf1
am: e87661eecb

Change-Id: Ie8cf0f2832d13ace8012bc9f4c74ec41be6e7125