Merge "Update to improved system_properties API." am: e3f9772919

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1974223

Change-Id: I33f088c75a81b9fe55719e4d4ea00e5129e3abc6