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

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

Change-Id: I1cdeeeed17212edcdd120cdddfd79e2ed7106231