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

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

Change-Id: Ic0de65d233691507a9cb7df6cb731b4d8f566daf