Merge "Fix classpath exclusion" am: dc727b7351

Original change: https://android-review.googlesource.com/c/platform/cts/+/1525019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic85de72224ac4167468532b919b9dac047b6f484