[automerger skipped] Merge "Revert "Add systrace tag for system property""...

[automerger skipped] Merge "Revert "Add systrace tag for system property"" into sc-dev am: f3fea377 -s ours am: a620dc04 -s ours

am skip reason: Merged-In I9305003531c6a86194d55dc72c613337d213b53d with SHA-1 18e0f65c is already in history

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

Change-Id: I105d060127b60fdc41084473bd733e3509d284ee