Merge "Remove the usage of SystemProperties.set()" am: fe1f37de9c am: 1ed76ebfe8

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

Change-Id: Ia709f1949930beb65191e197110114414332e72a