Merge "[automerger skipped] Merge "[DeviceConfig] cherry-pick deleteProperty...

Merge "[automerger skipped] Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi" am: 6ff14106 am: ab9e828a am: f8adc169 -s ours" into tm-dev am: 0a43517d -s ours

am skip reason: Merged-In I43d7177c509501efd65e32ab3ad000d17d6ffb6c with SHA-1 598a193f is already in history

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



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