[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Add STS annotations to EphemeralTest" into oc-mr1-dev am: 3626f42b94 -s ours am: c42dae36ba -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic153cf4f67c888b930d2fa1901d8f84318a361d4