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

[automerger skipped] Merge "Add systrace tag for system property" am: 59ca9012 am: 6263c29c -s ours

am skip reason: Change-Id I6f85f3f52f6580bab4ff43fc1dc0e87c689b054e with SHA-1 12d45642 is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1404427

Change-Id: I6bbb7633ac6cd28df49bb54cdcac11f68fb7aa8d