Add --os_version and --os_patch_level to bootimg am: 1c9c335a am: 9f78292e

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



Change-Id: Ia824ba4eaee91d26fbc544b0a9c082201b08829b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>