[automerger skipped] Allowing GSI patch level to be greater than vbmeta SPL am: cf636023 -s ours am: 96e40932 -s ours

am skip reason: Change-Id Ib761d80c88695eb2db08b0dc00e30fcdc2788865 with SHA-1 2c94e430 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1418048

Change-Id: Iff9da57c09ad772002b17861cda029a792b41f40