Merge "[automerger skipped] Merge "Remove a couple of LMK properties from GSI...
Merge "[automerger skipped] Merge "Remove a couple of LMK properties from GSI image" into rvc-dev am: 559d1769 am: 3d535f6b am: 18c0b799 -s ours" into rvc-qpr-dev-plus-aosp