[automerger skipped] Merge "Revert "Add systrace tag for system property"" into sc-dev am: 95e50fed -s ours am: 2ed94835 -s ours am: 6a343b5f -s ours

am skip reason: Merged-In Iaf522b403e51abcf1d49804f35a184b4aa0d3209 with SHA-1 137d78bb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336322

Change-Id: I5e077cb3b95b152f1b9efb44f1e7c12e1cf881af