[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 -s ours am: 3636de40 -s ours

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

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

Change-Id: I949fabe0c37231f51d4ae62faf48f9b267d2358c