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

[automerger skipped] Merge "Add systrace tag for system property" am: bd04e459 am: e8586725 -s ours

am skip reason: Change-Id Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4a is in history

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

Change-Id: Ic3ee7a770031ab343b0fa959605260a76df16506