Merge "Remove the tech debt from the property_service" am: 8371ec25ab am: 9beeed390c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1698925

Change-Id: I4c127fd90514f2308382ed027273456cca8eec5e