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

[automerger skipped] Merge "Add systrace tag for system property" am: 2cd4ea8d am: 2468183a -s ours am: 16ba30e0 -s ours am: d8c86d3c -s ours am: dc66d138 -s ours

am skip reason: Change-Id I1ba9fc7bddd93aa0dc9a0ded8600c08e6ace886b with SHA-1 ed690450 is in history

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

Change-Id: I4011bb2a38fdb16c6253704130deb0fb4564c66e