[automerger skipped] Merge "Revert "Add systrace tag for system property"" into sc-dev am: 95e50fed20 am: 0bc5cce243 -s ours
am skip reason: Merged-In Iaf522b403e51abcf1d49804f35a184b4aa0d3209 with SHA-1 e169c22053 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336322
Change-Id: I6a291d13eae80beecafde4313c0c83b22f1f48cf
This commit is contained in: