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

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

Change-Id: Ie125f2d0d5605180189fa1dfbef70286ad79c23e