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

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

Change-Id: I5fe58bbdac048a1064d3c717d1214d0bda3625bf