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

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

Change-Id: I25836ec2b42a7f213792b68a53daa781d939f25d