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

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

Change-Id: I840a9f7f8ca64b77657f810648b3b1f2eb963c20