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

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

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