[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS include missing apps from EphemeralTest" into oc-dr1-dev am: 9c9a9bb0eb -s ours

am skip reason: Change-Id Ifac667a3667727815f3c0b789ed8816035266802 with SHA-1 661526a310 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9d15f4742e560138b25e29c458a0eb360110f45