[automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours am: 09adeddd2a -s ours

am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf 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: Ib14493ee49e9bf9cfb2870aa9aaeadeb31f5ee18