[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 skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72d39273d77bf9881df35a6494aee4b55f21112f