[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS include missing apps from EphemeralTest" into oc-dr1-dev am: 9c9a9bb0eb -s ours am: 7e18a83ced -s ours am: fe2523cfcd -s ours am: 8d6e5d0883 -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: I06a4e57c0aa6d2e18f64bf2ada8deb6aa234c006