Merge "Fix MockInCallService's default starting values" into marshmallow-cts-dev
am: 45d620cc18

Change-Id: If44745689739113b6f16ff8d74bb6341d4534f20