Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi"