[automerger skipped] Allowing GSI patch level to be greater than vbmeta SPL...

[automerger skipped] Allowing GSI patch level to be greater than vbmeta SPL am: 2c94e430 am: e42109b5 am: cb6cd0c1 -s ours am: 7baf3e33 -s ours am: 94cf8b66 -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: I7d86f865a7905a158baa38f1e0a515c17edad951