Merge "Fix for #testInCallServiceOutgoing" into oreo-cts-dev
am: 8712d089f7

Change-Id: Ib540966649c3cc77d90c8a4b17a571f7ff3e662f