[automerger skipped] Allowing GSI patch level to be greater than vbmeta SPL am: 2c94e430 am: e42109b5 -s ours am: 2896be9a -s ours am: 366bd0e1 -s ours

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

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

Change-Id: I9dfdc064597ad2096e59ab72d32e89b469917a0d