[automerger skipped] Merge "Remove a couple of LMK properties from GSI image"...

[automerger skipped] Merge "Remove a couple of LMK properties from GSI image" into rvc-dev am: 559d1769 -s ours am: e01ac25d -s ours am: 6374c8ad -s ours

am skip reason: Change-Id Id0001f8c4187a280cffe6c72d7a39be29065ca4e with SHA-1 5f97d6d2 is in history

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

Change-Id: Ic1d07df5b109187d65e97beb234626ea15774c98