[automerger skipped] Merge "Add systrace tag for system property" into rvc-dev-plus-aosp am: 2616e495 am: 204bca2f am: e2eac3e6 -s ours

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

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

Change-Id: I4d8f826548051cfe37c8489128e9a00576e6a18b