Merge "Fix SECURITY_MODEL_COMPATIBLE tests" into sc-dev am: 69a9342bb1 am: af0127e9ec

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

Change-Id: Iad643044a63664ab10473ad7fb3adbf09e01eef9