Merge "[RESTRICT AUTOMERGE]: Add STS annotations to EphemeralTest" into rvc-dev am: 5521bb5df3 am: f3d5d5984c

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

Change-Id: I07134aeab72d73d061c89498fb4fa8732ec72387