[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 am: 294b32dd -s ours

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

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

Change-Id: Idbce6bf258a1eb036251737b561b85b54ebd015f