Merge "Allowing GSI patch level to be greater than vbmeta SPL" am: b22330e065

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

Change-Id: Ic3b7ee64244f03625af7cd2aea055f31febdb19d