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

am skip reason: Change-Id Ib761d80c88695eb2db08b0dc00e30fcdc2788865 with SHA-1 63c0129fa6 is in history

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

Change-Id: I82823b3842e5f4c4b2f17a64b8cfd3330740d5e5