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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37ad07d70b60eaa8195266599d315a0a67dc7b2a