[automerger skipped] Merge "Revert "Add systrace tag for system property"" into sc-dev am: 9c0fda565a -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: I6584dbd2afe32f2bdcc6ee21e8c5673d244e37f9