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

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

Change-Id: I8e9e35a830f2329a94eb6da93ea2fb17e912dd00