Merge "Fix MockInCallService's default starting values" into marshmallow-cts-dev am: 45d620cc18 am: 4d10b90a7c am: 3e83e2d882 am: 12a5b4389a am: 0003dfca15  -s ours am: 4152aba567  -s ours am: 07e79968a4  -s ours am: 9caba2f44b  -s ours am: e61e2c648d  -s ours am: 3f1a926ef0  -s ours
am: 4554749d86  -s ours

Change-Id: I07b305351b7556c52e277d7f5c51b3480e12fe33