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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0692d06bcb56366a8fdd306763eda09e437dd503