Merge "Merge "Fix MockInCallService's default starting values" into marshmallow-cts-dev am: 45d620cc18  -s ours" into nougat-cts-dev am: a972681c6e  -s ours am: ce61c631a6  -s ours am: 6e86b695d7  -s ours am: b13ebdc64d  -s ours am: f1122bcb62  -s ours am: fcddd6b563  -s ours
am: 6374b76143  -s ours

Change-Id: I9a045c45e07acce3dd6e19bbd0a0d46c2d3f4f04