Revert "Remove dependency on SystemProperties.set"

This reverts commit 08d95482a44c646960c8ccc17c6f436089a51fb3.

Reason for revert: <Droidmonitor created revert due to b/366100309. Will be verifying through ABTD before submission.>

Change-Id: I47dfe0240f5cea5508df638a2e451e8398a23f04
2 files changed