[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 am: 3d535f6b am: 18c0b799 -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: If448fc98879f11d858f6e5b89cb83bb96cccdccf