[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: 3960e32a -s ours

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

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

Change-Id: I6cccfc0bf1589c777a2d927f90d9c61b62d58363