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

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

Change-Id: I66e32ac8164fce2e205c49e407eb901994bcd5c8