Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi" am: 6ff14106fc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040764

Change-Id: I4cf03283a253a93f793c6ccad088272972d5e048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>