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

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

Change-Id: I13590cd39084babb6230b9259bd1873259272be8