Merge "Merge "Merge "Fix MockInCallService's default starting values" into marshmallow-cts-dev am: 45d620cc18  -s ours" into nougat-cts-dev am: a972681c6e  -s ours" into nougat-mr1-cts-dev am: f80dd50e72  -s ours am: 151114dc00  -s ours am: f0060b3f3b  -s ours am: 3acf12b6d3  -s ours
am: 20835ad270  -s ours

Change-Id: I2129bd6436a33beaded981a61cb4d3e28b7c685f