Merge "Updated CTS test for Android Security b/185126149" into qt-dev am: 7983d3bdcb am: 7c08853ad8 am: 7251103bcf am: 8b3f3ffcf3 am: 94c34f5e28 am: 7a191a5bda

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

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