Merge "[automerger skipped] Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi" am: 6ff14106fc am: ab9e828a43 am: f8adc1692b -s ours" into tm-dev