Merge "Updated CTS test for Android Security b/206987762" into rvc-dev am: 1f0b838cb5 am: 965c7ebcf6 am: e50ce5c12c am: 3bc6e7124b am: 395178bdf6 am: ec9d43a55c am: b186b297e1

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

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