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

[automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 7d11ce85 -s ours am: 294c3676 -s ours am: 2a161a1c -s ours

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

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

Change-Id: Iab64767a9737948dae35a4edee9516d4de13be3e