Merge "Add classes to Dynamic STS" into rvc-dev am: 2b765d8688 am: da5dc993fc am: 23aae6ba77

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

Change-Id: Icf2ee235fb7415cb21b5d6afdb3bb45a5ee970dc