[automerger skipped] Merge "Revert "Add systrace tag for system property"" into sc-dev am: 9c0fda565a -s ours am: 3703bfeb96 -s ours

am skip reason: Merged-In I4d8c9e191e28cc99abc4f80600405bfc1b7e48b6 with SHA-1 dc5577c75e is already in history

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

Change-Id: Ia1035c08076690b9aca41d54dd5f9f037be94456