Merge "Updated CTS test for Android Security b/231322873" into rvc-dev am: 9e2c580dda am: 77776179f0 am: 304ba8aad6

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

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