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

[automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd -s ours am: 09adeddd -s ours am: a4ad343e -s ours am: 07a7cf04 -s ours

am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4a is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767730

Change-Id: If3b7a0c3cd31c27cfc8dcf14abb3fe105948cbc4