[automerger skipped] Merge "Revert "Add systrace tag for system property""...

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

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

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

Change-Id: I1ba25ed913716382796ac54b45536063681fc4dd