Merge "STS test for Android Security Bug 183410508" into sc-dev am: e6ee845c3a am: 0c4e43185e

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

Change-Id: I53eed2cf3ffc24aa882635ea963dd023b621a45c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>