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

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

Change-Id: I3a67fc2a68492c2e9fa43a0d16b1f27b89e0a2c8