Merge "When using a GSI (Generic System Image) on a device with a Keymaster implementation, the Tag::OS_PATCHLEVEL key-character value must be less than or equal to the actual OS patch level of the device." into main am: bb508ba215

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3495026

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