Merge "Fix classpath exclusion" am: dc727b7351 am: 12db95031f am: 9bf8013933

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85fdd73a28c1382c7424e023216e1887936b0009