Merge "STS include missing apps from EphemeralTest" into oc-mr1-dev am: a05fcab23d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b84e02ab366b2d997d368303db1240cd2bc3408