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

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

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