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

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

Change-Id: Iac749359f15229a89782e16309352ef8f0624da1