Merge "Add STS test to Dynamic" into rvc-dev am: f92df82512 am: 9f7e8282f1 am: 5b90d321d7 am: 646ed6920f

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

Change-Id: I906b97b74cc61bc21ae26280f6a4c5b6997e1ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>