[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 am: 87968625 -s ours am: d55528ca -s ours

am skip reason: Merged-In I9305003531c6a86194d55dc72c613337d213b53d with SHA-1 94b21c0c is already in history

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

Change-Id: I9c8473bf0d5ce8285bfc5e6329b38e362ac49141