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

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

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

Change-Id: I03be31fc99e7c23344301e644c9242ee1b96c553