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