Merge "Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: 2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91" into oc-dr1-dev-plus-aosp
am: 1eda771728

Change-Id: I44551434bc0c9197b106770c761ff4026fedbf26