Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: deeca962a7 am: bc79b99ca6 am: d917970ed2 am: d41e268d16

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

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