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

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

Change-Id: I5f459aa58a76a8e7856e6ee27c7cd40c894f7f88