[automerger skipped] Merge "Revert "Add systrace tag for system property"" am: c18818c651 -s ours

am skip reason: Merged-In I1ba9fc7bddd93aa0dc9a0ded8600c08e6ace886b with SHA-1 a9cbe47961 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1403308

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1767729

Change-Id: I591f37d9bd8b0c55ff4850cda1153e7ae1f9fe9f