Merge "Fix JUnitParamsRunner so it works with CTS sharding am: b03560c3 am: 2f41cd20 am: f5852119 am: 55edd63f am: c27747cb am: 3422818d" into oc-dr1-dev-plus-aosp
mentioned in commit 4f0b0c84