Merge "Do not use hidden SystemProperties.set" am: 8c6ec17bac am: d7146b6742

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

Change-Id: I3ff0ce12f3b12e0eb78f330a75675fb79ecf561d