Merge "Clear OS version and patch level fields for GKI boot images" am: 8131404331

Original change: https://android-review.googlesource.com/c/platform/build/+/2022898

Change-Id: I4c051b6573a270b5867bda9ba20179fe210839fb