[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS include missing apps from EphemeralTest" into oc-dev am: c5f5cb66f7 -s ours am: 7cc3623902 -s ours am: 1b2f853d5a -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96e2435023276a56182e1ce4f595c7b90e903406