Merge "Fix for #testInCallServiceOutgoing" into oreo-cts-dev