Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: 2f41cd20c0 am: f58521195e am: 55edd63fa3
am: c27747cb91

Change-Id: I342667526228eff6b871ee33baa94b71d8cc420d