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

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

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