[automerger skipped] Merge "Add classes to Dynamic STS" into qt-dev am: 37d2156eed -s ours am: 43561ef2dc -s ours am: b3fb554ca6 -s ours am: a2be77820a -s ours am: 2614e66aa3 -s ours am: 61e9786baf -s ours

am skip reason: Merged-In I08f37dde327c56b820b113662f0170dfe460e5b7 with SHA-1 b3e4adc32a is already in history

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

Change-Id: Ie7c140449be7c9583f9044466693c67021777524