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

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

Change-Id: If6721904a50f164626d30460a2b13c59ffd2814f