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

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

Change-Id: Ie38e0ce264c899b278c2e46379bbeb9e787fb25a